/ BCI NET 2 / BCI NET 2.iso / archives / programming / source / a2.0bemacs-src.lha / Emacs-19.25 / lisp / diff.elc

< prev

next >

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6b 77 7a 68 40 68 61 |piled by| kwzh@ha|
|00000020| 6c 2e 67 6e 75 2e 61 69 | 2e 6d 69 74 2e 65 64 75 |l.gnu.ai|.mit.edu|
|00000030| 20 6f 6e 20 46 72 69 20 | 41 70 72 20 32 32 20 32 | on Fri |Apr 22 2|
|00000040| 30 3a 31 32 3a 35 37 20 | 31 39 39 34 0a 3b 3b 3b |0:12:57 |1994.;;;|
|00000050| 20 66 72 6f 6d 20 66 69 | 6c 65 20 2f 67 64 2f 67 | from fi|le /gd/g|
|00000060| 6e 75 2f 65 6d 61 63 73 | 2f 31 39 2e 30 2f 6c 69 |nu/emacs|/19.0/li|
|00000070| 73 70 2f 64 69 66 66 2e | 65 6c 0a 3b 3b 3b 20 65 |sp/diff.|el.;;; e|
|00000080| 6d 61 63 73 20 76 65 72 | 73 69 6f 6e 20 31 39 2e |macs ver|sion 19.|
|00000090| 32 32 2e 39 30 2e 34 2e | 0a 3b 3b 3b 20 62 79 74 |22.90.4.|.;;; byt|
|000000a0| 65 63 6f 6d 70 20 76 65 | 72 73 69 6f 6e 20 46 53 |ecomp ve|rsion FS|
|000000b0| 46 20 32 2e 31 30 0a 3b | 3b 3b 20 6f 70 74 69 6d |F 2.10.;|;; optim|
|000000c0| 69 7a 61 74 69 6f 6e 20 | 69 73 20 6f 6e 2e 0a 3b |ization |is on..;|
|000000d0| 3b 3b 20 74 68 69 73 20 | 66 69 6c 65 20 75 73 65 |;; this |file use|
|000000e0| 73 20 6f 70 63 6f 64 65 | 73 20 77 68 69 63 68 20 |s opcode|s which |
|000000f0| 64 6f 20 6e 6f 74 20 65 | 78 69 73 74 20 69 6e 20 |do not e|xist in |
|00000100| 45 6d 61 63 73 20 31 38 | 2e 0a 0a 28 69 66 20 28 |Emacs 18|...(if (|
|00000110| 61 6e 64 20 28 62 6f 75 | 6e 64 70 20 27 65 6d 61 |and (bou|ndp 'ema|
|00000120| 63 73 2d 76 65 72 73 69 | 6f 6e 29 0a 09 20 28 6f |cs-versi|on).. (o|
|00000130| 72 20 28 61 6e 64 20 28 | 62 6f 75 6e 64 70 20 27 |r (and (|boundp '|
|00000140| 65 70 6f 63 68 3a 3a 76 | 65 72 73 69 6f 6e 29 20 |epoch::v|ersion) |
|00000150| 65 70 6f 63 68 3a 3a 76 | 65 72 73 69 6f 6e 29 0a |epoch::v|ersion).|
|00000160| 09 20 20 20 20 20 28 73 | 74 72 69 6e 67 2d 6c 65 |.     (s|tring-le|
|00000170| 73 73 70 20 65 6d 61 63 | 73 2d 76 65 72 73 69 6f |ssp emac|s-versio|
|00000180| 6e 20 22 31 39 22 29 29 | 29 0a 20 20 20 20 28 65 |n "19"))|).    (e|
|00000190| 72 72 6f 72 20 22 60 2f | 67 64 2f 67 6e 75 2f 65 |rror "`/|gd/gnu/e|
|000001a0| 6d 61 63 73 2f 31 39 2e | 30 2f 6c 69 73 70 2f 64 |macs/19.|0/lisp/d|
|000001b0| 69 66 66 2e 65 6c 27 20 | 77 61 73 20 63 6f 6d 70 |iff.el' |was comp|
|000001c0| 69 6c 65 64 20 66 6f 72 | 20 45 6d 61 63 73 20 31 |iled for| Emacs 1|
|000001d0| 39 22 29 29 0a 0a 28 72 | 65 71 75 69 72 65 20 28 |9"))..(r|equire (|
|000001e0| 71 75 6f 74 65 20 63 6f | 6d 70 69 6c 65 29 29 0a |quote co|mpile)).|
|000001f0| 28 64 65 66 76 61 72 20 | 64 69 66 66 2d 73 77 69 |(defvar |diff-swi|
|00000200| 74 63 68 65 73 20 22 2d | 63 22 20 22 5c 0a 2a 41 |tches "-|c" "\.*A|
|00000210| 20 73 74 72 69 6e 67 20 | 6f 72 20 6c 69 73 74 20 | string |or list |
|00000220| 6f 66 20 73 74 72 69 6e | 67 73 20 73 70 65 63 69 |of strin|gs speci|
|00000230| 66 79 69 6e 67 20 73 77 | 69 74 63 68 65 73 20 74 |fying sw|itches t|
|00000240| 6f 20 62 65 20 62 65 20 | 70 61 73 73 65 64 20 74 |o be be |passed t|
|00000250| 6f 20 64 69 66 66 2e 22 | 29 0a 28 64 65 66 76 61 |o diff."|).(defva|
|00000260| 72 20 64 69 66 66 2d 72 | 65 67 65 78 70 2d 61 6c |r diff-r|egexp-al|
|00000270| 69 73 74 20 28 71 75 6f | 74 65 20 28 28 22 5e 40 |ist (quo|te (("^@|
|00000280| 40 20 2d 5c 5c 28 5b 30 | 2d 39 5d 2b 5c 5c 29 2c |@ -\\([0|-9]+\\),|
|00000290| 5b 30 2d 39 5d 2b 20 5c | 5c 2b 5c 5c 28 5b 30 2d |[0-9]+ \|\+\\([0-|
|000002a0| 39 5d 2b 5c 5c 29 2c 5b | 30 2d 39 5d 2b 20 40 40 |9]+\\),[|0-9]+ @@|
|000002b0| 24 22 20 31 20 32 29 20 | 28 22 5e 5c 5c 2a 5c 5c |$" 1 2) |("^\\*\\|
|000002c0| 2a 5c 5c 2a 20 5c 5c 28 | 5b 30 2d 39 5d 2b 5c 5c |*\\* \\(|[0-9]+\\|
|000002d0| 29 2c 5b 30 2d 39 5d 2b | 20 5c 5c 2a 5c 5c 2a 5c |),[0-9]+| \\*\\*\|
|000002e0| 5c 2a 5c 5c 2a 24 22 20 | 31 20 6e 69 6c 29 20 28 |\*\\*$" |1 nil) (|
|000002f0| 22 5e 2d 2d 2d 20 5c 5c | 28 5b 30 2d 39 5d 2b 5c |"^--- \\|([0-9]+\|
|00000300| 5c 29 2c 5b 30 2d 39 5d | 2b 20 2d 2d 2d 2d 24 22 |\),[0-9]|+ ----$"|
|00000310| 20 6e 69 6c 20 31 29 20 | 28 22 5e 5c 5c 28 5b 30 | nil 1) |("^\\([0|
|00000320| 2d 39 5d 2b 5c 5c 29 5c | 5c 28 2c 5b 30 2d 39 5d |-9]+\\)\|\(,[0-9]|
|00000330| 2b 5c 5c 29 3f 5b 61 64 | 63 5d 5c 5c 28 5b 30 2d |+\\)?[ad|c]\\([0-|
|00000340| 39 5d 2b 5c 5c 29 5c 5c | 28 2c 5b 30 2d 39 5d 2b |9]+\\)\\|(,[0-9]+|
|00000350| 5c 5c 29 3f 24 22 20 31 | 20 33 29 20 28 22 5e 5c |\\)?$" 1| 3) ("^\|
|00000360| 5c 28 5b 30 2d 39 5d 2b | 5c 5c 29 5c 5c 28 2c 5b |\([0-9]+|\\)\\(,[|
|00000370| 30 2d 39 5d 2b 5c 5c 29 | 3f 5b 61 64 63 5d 24 22 |0-9]+\\)|?[adc]$"|
|00000380| 20 31 29 20 28 22 5e 5b | 61 64 63 5d 5c 5c 28 5b | 1) ("^[|adc]\\([|
|00000390| 30 2d 39 5d 2b 5c 5c 29 | 5c 5c 28 20 5b 30 2d 39 |0-9]+\\)|\\( [0-9|
|000003a0| 5d 2b 5c 5c 29 3f 24 22 | 20 31 29 29 29 20 22 5c |]+\\)?$"| 1))) "\|
|000003b0| 0a 41 6c 69 73 74 20 28 | 52 45 47 45 58 50 20 4f |.Alist (|REGEXP O|
|000003c0| 4c 44 2d 49 44 58 20 4e | 45 57 2d 49 44 58 29 20 |LD-IDX N|EW-IDX) |
|000003d0| 6f 66 20 72 65 67 75 6c | 61 72 20 65 78 70 72 65 |of regul|ar expre|
|000003e0| 73 73 69 6f 6e 73 20 74 | 6f 20 6d 61 74 63 68 20 |ssions t|o match |
|000003f0| 64 69 66 66 65 72 65 6e | 63 65 20 0a 73 65 63 74 |differen|ce .sect|
|00000400| 69 6f 6e 73 20 69 6e 20 | 5c 5c 5b 64 69 66 66 5d |ions in |\\[diff]|
|00000410| 20 6f 75 74 70 75 74 2e | 20 20 49 66 20 52 45 47 | output.|  If REG|
|00000420| 45 58 50 20 6d 61 74 63 | 68 65 73 2c 20 74 68 65 |EXP matc|hes, the|
|00000430| 20 4f 4c 44 2d 49 44 58 | 27 74 68 0a 73 75 62 65 | OLD-IDX|'th.sube|
|00000440| 78 70 72 65 73 73 69 6f | 6e 20 67 69 76 65 73 20 |xpressio|n gives |
|00000450| 74 68 65 20 6c 69 6e 65 | 20 6e 75 6d 62 65 72 20 |the line| number |
|00000460| 69 6e 20 74 68 65 20 6f | 6c 64 20 66 69 6c 65 2c |in the o|ld file,|
|00000470| 20 61 6e 64 20 4e 45 57 | 2d 49 44 58 27 74 68 0a | and NEW|-IDX'th.|
|00000480| 73 75 62 65 78 70 72 65 | 73 73 69 6f 6e 20 67 69 |subexpre|ssion gi|
|00000490| 76 65 73 20 74 68 65 20 | 6c 69 6e 65 20 6e 75 6d |ves the |line num|
|000004a0| 62 65 72 20 69 6e 20 74 | 68 65 20 6e 65 77 20 66 |ber in t|he new f|
|000004b0| 69 6c 65 2e 20 20 49 66 | 20 4f 4c 44 2d 49 44 58 |ile.  If| OLD-IDX|
|000004c0| 20 6f 72 20 4e 45 57 2d | 49 44 58 0a 69 73 20 6e | or NEW-|IDX.is n|
|000004d0| 69 6c 2c 20 52 45 47 45 | 58 50 20 6d 61 74 63 68 |il, REGE|XP match|
|000004e0| 65 73 20 6f 6e 6c 79 20 | 68 61 6c 66 20 61 20 73 |es only |half a s|
|000004f0| 65 63 74 69 6f 6e 2e 22 | 29 0a 28 64 65 66 76 61 |ection."|).(defva|
|00000500| 72 20 64 69 66 66 2d 6f | 6c 64 2d 66 69 6c 65 20 |r diff-o|ld-file |
|00000510| 6e 69 6c 20 22 5c 0a 54 | 68 69 73 20 69 73 20 74 |nil "\.T|his is t|
|00000520| 68 65 20 6f 6c 64 20 66 | 69 6c 65 20 6e 61 6d 65 |he old f|ile name|
|00000530| 20 69 6e 20 74 68 65 20 | 63 6f 6d 70 61 72 69 73 | in the |comparis|
|00000540| 6f 6e 20 69 6e 20 74 68 | 69 73 20 62 75 66 66 65 |on in th|is buffe|
|00000550| 72 2e 22 29 0a 28 64 65 | 66 76 61 72 20 64 69 66 |r.").(de|fvar dif|
|00000560| 66 2d 6e 65 77 2d 66 69 | 6c 65 20 6e 69 6c 20 22 |f-new-fi|le nil "|
|00000570| 5c 0a 54 68 69 73 20 69 | 73 20 74 68 65 20 6e 65 |\.This i|s the ne|
|00000580| 77 20 66 69 6c 65 20 6e | 61 6d 65 20 69 6e 20 74 |w file n|ame in t|
|00000590| 68 65 20 63 6f 6d 70 61 | 72 69 73 6f 6e 20 69 6e |he compa|rison in|
|000005a0| 20 74 68 69 73 20 62 75 | 66 66 65 72 2e 22 29 0a | this bu|ffer.").|
|000005b0| 28 64 65 66 76 61 72 20 | 64 69 66 66 2d 6f 6c 64 |(defvar |diff-old|
|000005c0| 2d 74 65 6d 70 2d 66 69 | 6c 65 20 6e 69 6c 20 22 |-temp-fi|le nil "|
|000005d0| 5c 0a 54 68 69 73 20 69 | 73 20 74 68 65 20 6e 61 |\.This i|s the na|
|000005e0| 6d 65 20 6f 66 20 61 20 | 74 65 6d 70 20 66 69 6c |me of a |temp fil|
|000005f0| 65 20 74 6f 20 62 65 20 | 64 65 6c 65 74 65 64 20 |e to be |deleted |
|00000600| 61 66 74 65 72 20 64 69 | 66 66 20 66 69 6e 69 73 |after di|ff finis|
|00000610| 68 65 73 2e 22 29 0a 28 | 64 65 66 76 61 72 20 64 |hes.").(|defvar d|
|00000620| 69 66 66 2d 6e 65 77 2d | 74 65 6d 70 2d 66 69 6c |iff-new-|temp-fil|
|00000630| 65 20 6e 69 6c 20 22 5c | 0a 54 68 69 73 20 69 73 |e nil "\|.This is|
|00000640| 20 74 68 65 20 6e 61 6d | 65 20 6f 66 20 61 20 74 | the nam|e of a t|
|00000650| 65 6d 70 20 66 69 6c 65 | 20 74 6f 20 62 65 20 64 |emp file| to be d|
|00000660| 65 6c 65 74 65 64 20 61 | 66 74 65 72 20 64 69 66 |eleted a|fter dif|
|00000670| 66 20 66 69 6e 69 73 68 | 65 73 2e 22 29 0a 28 64 |f finish|es.").(d|
|00000680| 65 66 61 6c 69 61 73 20 | 28 71 75 6f 74 65 20 64 |efalias |(quote d|
|00000690| 69 66 66 2d 70 61 72 73 | 65 2d 64 69 66 66 65 72 |iff-pars|e-differ|
|000006a0| 65 6e 63 65 73 29 20 23 | 5b 28 6c 69 6d 69 74 2d |ences) #|[(limit-|
|000006b0| 73 65 61 72 63 68 20 66 | 69 6e 64 2d 61 74 2d 6c |search f|ind-at-l|
|000006c0| 65 61 73 74 29 20 22 c0 | 11 c2 c3 21 88 5c 66 83 |east) ".|...!.\f.|
|000006d0| 0d 00 5c 66 62 88 c5 c6 | 0e 07 c8 23 c9 1e 5c 6e |..\fb...|...#..\n|
|000006e0| cb cc 0e 07 5c 22 29 cd | c0 ce c0 1e 0f 1e 10 1e |....\").|........|
|000006f0| 11 1e 12 1e 13 1e 14 0e | 11 84 9e 00 d5 0e 14 c0 |........|........|
|00000700| d6 23 83 9e 00 0e 13 89 | 16 0f 83 53 00 0e 0f 40 |.#......|...S...@|
|00000710| 40 94 84 53 00 0e 0f 41 | 89 16 0f 84 42 00 0e 0f |@..S...A|....B...|
|00000720| 40 89 16 0f 41 40 83 68 | 00 0e 12 0e 17 0e 0f 41 |@...A@.h|.......A|
|00000730| 40 5c 22 88 d8 0e 0f 38 | 83 79 00 0e 12 0e 19 d8 |@\"....8|.y......|
|00000740| 0e 0f 38 5c 22 88 0e 10 | 54 16 10 0e 1a 83 8b 00 |..8\"...|T.......|
|00000750| 0e 10 0e 1a 59 84 97 00 | 0e 1b 83 2c 00 60 0e 1b |....Y...|...,.`..|
|00000760| 59 83 2c 00 d6 89 16 11 | 83 31 00 0e 11 83 a8 00 |Y.,.....|.1......|
|00000770| 60 14 82 aa 00 64 14 c2 | dc 21 88 2e 06 09 9f 89 |`....d..|.!......|
|00000780| 11 87 22 20 5b 6e 69 6c | 20 63 6f 6d 70 69 6c 61 |.." [nil| compila|
|00000790| 74 69 6f 6e 2d 65 72 72 | 6f 72 2d 6c 69 73 74 20 |tion-err|or-list |
|000007a0| 6d 65 73 73 61 67 65 20 | 22 50 61 72 73 69 6e 67 |message |"Parsing|
|000007b0| 20 64 69 66 66 65 72 65 | 6e 63 65 73 2e 2e 2e 22 | differe|nces..."|
|000007c0| 20 63 6f 6d 70 69 6c 61 | 74 69 6f 6e 2d 70 61 72 | compila|tion-par|
|000007d0| 73 69 6e 67 2d 65 6e 64 | 20 6d 61 70 63 6f 6e 63 |sing-end| mapconc|
|000007e0| 61 74 20 23 5b 28 65 6c | 74 29 20 22 c0 09 40 c2 |at #[(el|t) "..@.|
|000007f0| 51 87 22 20 5b 22 5c 5c | 28 22 20 65 6c 74 20 22 |Q." ["\\|(" elt "|
|00000800| 5c 5c 29 22 5d 20 33 5d | 20 64 69 66 66 2d 72 65 |\\)"] 3]| diff-re|
|00000810| 67 65 78 70 2d 61 6c 69 | 73 74 20 22 5c 5c 7c 22 |gexp-ali|st "\\|"|
|00000820| 20 31 20 73 75 62 65 78 | 70 72 20 6d 61 70 63 61 | 1 subex|pr mapca|
|00000830| 72 20 23 5b 28 65 6c 74 | 29 20 22 08 c1 c2 0b 41 |r #[(elt|) "....A|
|00000840| 5c 22 42 08 c4 0b 40 21 | c5 5c 5c 5c 5c 10 87 22 |\"B...@!|.\\\\.."|
|00000850| 20 5b 73 75 62 65 78 70 | 72 20 6d 61 70 63 61 72 | [subexp|r mapcar|
|00000860| 20 23 5b 28 6e 29 20 22 | 08 85 07 00 09 08 5c 5c | #[(n) "|......\\|
|00000870| 87 22 20 5b 6e 20 73 75 | 62 65 78 70 72 5d 20 32 |." [n su|bexpr] 2|
|00000880| 5d 20 65 6c 74 20 63 6f | 75 6e 74 2d 72 65 67 65 |] elt co|unt-rege|
|00000890| 78 70 2d 67 72 6f 75 70 | 69 6e 67 73 20 31 5d 20 |xp-group|ings 1] |
|000008a0| 34 5d 20 23 5b 28 66 69 | 6c 65 20 73 75 62 65 78 |4] #[(fi|le subex|
|000008b0| 70 72 29 20 22 8a 08 94 | 62 88 c1 79 88 c2 20 29 |pr) "...|b..y.. )|
|000008c0| c3 08 94 08 95 7b 21 1c | 8a c5 20 1e 06 c7 8e c8 |.....{!.|.. .....|
|000008d0| 0e 09 21 71 88 2a 8a ca | 5c 66 21 88 c2 20 2b 42 |..!q.*..|\f!.. +B|
|000008e0| 0e 0b 42 89 16 0b 87 22 | 20 5b 73 75 62 65 78 70 |..B...."| [subexp|
|000008f0| 72 20 30 20 70 6f 69 6e | 74 2d 6d 61 72 6b 65 72 |r 0 poin|t-marker|
|00000900| 20 73 74 72 69 6e 67 2d | 74 6f 2d 69 6e 74 20 6c | string-|to-int l|
|00000910| 69 6e 65 20 6d 61 74 63 | 68 2d 64 61 74 61 20 6d |ine matc|h-data m|
|00000920| 61 74 63 68 2d 64 61 74 | 61 20 28 28 73 74 6f 72 |atch-dat|a ((stor|
|00000930| 65 2d 6d 61 74 63 68 2d | 64 61 74 61 20 6d 61 74 |e-match-|data mat|
|00000940| 63 68 2d 64 61 74 61 29 | 29 20 66 69 6e 64 2d 66 |ch-data)|) find-f|
|00000950| 69 6c 65 2d 6e 6f 73 65 | 6c 65 63 74 20 66 69 6c |ile-nose|lect fil|
|00000960| 65 20 67 6f 74 6f 2d 6c | 69 6e 65 20 63 6f 6d 70 |e goto-l|ine comp|
|00000970| 69 6c 61 74 69 6f 6e 2d | 65 72 72 6f 72 2d 6c 69 |ilation-|error-li|
|00000980| 73 74 5d 20 34 5d 20 30 | 20 67 20 6e 75 6d 2d 6c |st] 4] 0| g num-l|
|00000990| 6f 63 69 2d 66 6f 75 6e | 64 20 66 6f 75 6e 64 2d |oci-foun|d found-|
|000009a0| 64 65 73 69 72 65 64 20 | 6e 65 77 2d 65 72 72 6f |desired |new-erro|
|000009b0| 72 20 67 72 6f 75 70 73 | 20 72 65 67 65 78 70 20 |r groups| regexp |
|000009c0| 72 65 2d 73 65 61 72 63 | 68 2d 66 6f 72 77 61 72 |re-searc|h-forwar|
|000009d0| 64 20 74 20 64 69 66 66 | 2d 6f 6c 64 2d 66 69 6c |d t diff|-old-fil|
|000009e0| 65 20 32 20 64 69 66 66 | 2d 6e 65 77 2d 66 69 6c |e 2 diff|-new-fil|
|000009f0| 65 20 66 69 6e 64 2d 61 | 74 2d 6c 65 61 73 74 20 |e find-a|t-least |
|00000a00| 6c 69 6d 69 74 2d 73 65 | 61 72 63 68 20 22 50 61 |limit-se|arch "Pa|
|00000a10| 72 73 69 6e 67 20 64 69 | 66 66 65 72 65 6e 63 65 |rsing di|fference|
|00000a20| 73 2e 2e 2e 64 6f 6e 65 | 22 5d 20 37 5d 29 0a 28 |s...done|"] 7]).(|
|00000a30| 64 65 66 61 6c 69 61 73 | 20 27 64 69 66 66 20 23 |defalias| 'diff #|
|00000a40| 5b 28 6f 6c 64 20 6e 65 | 77 20 26 6f 70 74 69 6f |[(old ne|w &optio|
|00000a50| 6e 61 6c 20 73 77 69 74 | 63 68 65 73 29 20 22 c0 |nal swit|ches) ".|
|00000a60| 09 21 11 c0 5c 6e 21 12 | c3 5c 6e 21 c3 09 21 c4 |.!..\n!.|.\n!..!.|
|00000a70| 1d 1e 06 1e 07 c4 8e c8 | c9 ca cb 0e 5c 66 83 30 |........|....\f.0|
|00000a80| 00 0e 5c 66 3a 83 2a 00 | 0e 5c 66 82 3e 00 0e 5c |..\f:.*.|.\f.>..\|
|00000a90| 66 43 82 3e 00 0e 0d 3a | 83 3b 00 0e 0d 82 3e 00 |fC.>...:|.;....>.|
|00000aa0| 0e 0d 43 0e 07 84 48 00 | 0e 06 85 4d 00 ce 5c 6e |..C...H.|...M..\n|
|00000ab0| ce 09 46 cf 0e 07 86 54 | 00 5c 6e 21 43 cf 0e 06 |..F....T|.\n!C...|
|00000ac0| 86 5d 00 09 21 43 25 d0 | 23 1e 11 d2 0e 11 d3 d4 |.]..!C%.|#.......|
|00000ad0| d5 24 15 d6 0d 21 88 d7 | d8 21 5c 6e 4c 88 d7 d9 |.$...!..|.!\nL...|
|00000ae0| 21 09 4c 88 d7 da 21 0e | 07 4c 88 d7 db 21 0e 06 |!.L...!.|.L...!..|
|00000af0| 4c 88 d7 dc 21 dd 4c 88 | 0d 2d 87 22 20 5b 65 78 |L...!.L.|.-." [ex|
|00000b00| 70 61 6e 64 2d 66 69 6c | 65 2d 6e 61 6d 65 20 6e |pand-fil|e-name n|
|00000b10| 65 77 20 6f 6c 64 20 66 | 69 6c 65 2d 6c 6f 63 61 |ew old f|ile-loca|
|00000b20| 6c 2d 63 6f 70 79 20 6e | 69 6c 20 62 75 66 20 6e |l-copy n|il buf n|
|00000b30| 65 77 2d 61 6c 74 20 6f | 6c 64 2d 61 6c 74 20 6d |ew-alt o|ld-alt m|
|00000b40| 61 70 63 6f 6e 63 61 74 | 20 69 64 65 6e 74 69 74 |apconcat| identit|
|00000b50| 79 20 61 70 70 65 6e 64 | 20 28 22 64 69 66 66 22 |y append| ("diff"|
|00000b60| 29 20 73 77 69 74 63 68 | 65 73 20 64 69 66 66 2d |) switch|es diff-|
|00000b70| 73 77 69 74 63 68 65 73 | 20 22 2d 4c 22 20 73 68 |switches| "-L" sh|
|00000b80| 65 6c 6c 2d 71 75 6f 74 | 65 2d 61 72 67 75 6d 65 |ell-quot|e-argume|
|00000b90| 6e 74 20 22 20 22 20 63 | 6f 6d 6d 61 6e 64 20 63 |nt " " c|ommand c|
|00000ba0| 6f 6d 70 69 6c 65 2d 69 | 6e 74 65 72 6e 61 6c 20 |ompile-i|nternal |
|00000bb0| 22 4e 6f 20 6d 6f 72 65 | 20 64 69 66 66 65 72 65 |"No more| differe|
|00000bc0| 6e 63 65 73 22 20 22 44 | 69 66 66 22 20 64 69 66 |nces" "D|iff" dif|
|00000bd0| 66 2d 70 61 72 73 65 2d | 64 69 66 66 65 72 65 6e |f-parse-|differen|
|00000be0| 63 65 73 20 70 6f 70 2d | 74 6f 2d 62 75 66 66 65 |ces pop-|to-buffe|
|00000bf0| 72 20 6d 61 6b 65 2d 6c | 6f 63 61 6c 2d 76 61 72 |r make-l|ocal-var|
|00000c00| 69 61 62 6c 65 20 64 69 | 66 66 2d 6f 6c 64 2d 66 |iable di|ff-old-f|
|00000c10| 69 6c 65 20 64 69 66 66 | 2d 6e 65 77 2d 66 69 6c |ile diff|-new-fil|
|00000c20| 65 20 64 69 66 66 2d 6f | 6c 64 2d 74 65 6d 70 2d |e diff-o|ld-temp-|
|00000c30| 66 69 6c 65 20 64 69 66 | 66 2d 6e 65 77 2d 74 65 |file dif|f-new-te|
|00000c40| 6d 70 2d 66 69 6c 65 20 | 63 6f 6d 70 69 6c 61 74 |mp-file |compilat|
|00000c50| 69 6f 6e 2d 66 69 6e 69 | 73 68 2d 66 75 6e 63 74 |ion-fini|sh-funct|
|00000c60| 69 6f 6e 20 23 5b 28 62 | 75 66 66 20 6d 73 67 29 |ion #[(b|uff msg)|
|00000c70| 20 22 08 83 08 00 c1 08 | 21 88 5c 6e 85 0f 00 c1 | "......|!.\n....|
|00000c80| 5c 6e 21 87 22 20 5b 64 | 69 66 66 2d 6f 6c 64 2d |\n!." [d|iff-old-|
|00000c90| 74 65 6d 70 2d 66 69 6c | 65 20 64 65 6c 65 74 65 |temp-fil|e delete|
|00000ca0| 2d 66 69 6c 65 20 64 69 | 66 66 2d 6e 65 77 2d 74 |-file di|ff-new-t|
|00000cb0| 65 6d 70 2d 66 69 6c 65 | 5d 20 32 5d 5d 20 39 20 |emp-file|] 2]] 9 |
|00000cc0| 22 5c 0a 46 69 6e 64 20 | 61 6e 64 20 64 69 73 70 |"\.Find |and disp|
|00000cd0| 6c 61 79 20 74 68 65 20 | 64 69 66 66 65 72 65 6e |lay the |differen|
|00000ce0| 63 65 73 20 62 65 74 77 | 65 65 6e 20 4f 4c 44 20 |ces betw|een OLD |
|00000cf0| 61 6e 64 20 4e 45 57 20 | 66 69 6c 65 73 2e 0a 49 |and NEW |files..I|
|00000d00| 6e 74 65 72 61 63 74 69 | 76 65 6c 79 20 74 68 65 |nteracti|vely the|
|00000d10| 20 63 75 72 72 65 6e 74 | 20 62 75 66 66 65 72 27 | current| buffer'|
|00000d20| 73 20 66 69 6c 65 20 6e | 61 6d 65 20 69 73 20 74 |s file n|ame is t|
|00000d30| 68 65 20 64 65 66 61 75 | 6c 74 20 66 6f 72 20 4e |he defau|lt for N|
|00000d40| 45 57 0a 61 6e 64 20 61 | 20 62 61 63 6b 75 70 20 |EW.and a| backup |
|00000d50| 66 69 6c 65 20 66 6f 72 | 20 4e 45 57 20 69 73 20 |file for| NEW is |
|00000d60| 74 68 65 20 64 65 66 61 | 75 6c 74 20 66 6f 72 20 |the defa|ult for |
|00000d70| 4f 4c 44 2e 0a 57 69 74 | 68 20 70 72 65 66 69 78 |OLD..Wit|h prefix|
|00000d80| 20 61 72 67 2c 20 70 72 | 6f 6d 70 74 20 66 6f 72 | arg, pr|ompt for|
|00000d90| 20 64 69 66 66 20 73 77 | 69 74 63 68 65 73 2e 22 | diff sw|itches."|
|00000da0| 20 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 89 19 | (byte-c|ode "...|
|00000db0| 1a c3 20 89 11 83 1f 00 | c4 09 21 83 1f 00 c5 c6 |.. .....|..!.....|
|00000dc0| c7 09 21 c8 51 c0 09 c9 | 24 82 25 00 c5 ca c0 89 |..!.Q...|$.%.....|
|00000dd0| c9 24 89 11 cb 09 21 89 | 12 83 45 00 c4 5c 6e 21 |.$....!.|..E..\n!|
|00000de0| 83 45 00 c5 cc c7 5c 6e | 21 c8 51 cd 5c 6e 21 5c |.E....\n|!.Q.\n!\|
|00000df0| 6e c9 24 82 4d 00 c5 ce | cd 09 21 c0 c9 24 89 12 |n.$.M...|..!..$..|
|00000e00| 44 9f 2a 0e 0f 85 6c 00 | d0 d1 0e 12 3b 83 64 00 |D.*...l.|....;.d.|
|00000e10| 0e 12 82 6a 00 d3 d4 0e | 12 d5 23 5c 22 43 a4 87 |...j....|..#\"C..|
|00000e20| 22 20 5b 6e 69 6c 20 6e | 65 77 66 20 6f 6c 64 66 |" [nil n|ewf oldf|
|00000e30| 20 62 75 66 66 65 72 2d | 66 69 6c 65 2d 6e 61 6d | buffer-|file-nam|
|00000e40| 65 20 66 69 6c 65 2d 65 | 78 69 73 74 73 2d 70 20 |e file-e|xists-p |
|00000e50| 72 65 61 64 2d 66 69 6c | 65 2d 6e 61 6d 65 20 22 |read-fil|e-name "|
|00000e60| 44 69 66 66 20 6e 65 77 | 20 66 69 6c 65 3a 20 28 |Diff new| file: (|
|00000e70| 22 20 66 69 6c 65 2d 6e | 61 6d 65 2d 6e 6f 6e 64 |" file-n|ame-nond|
|00000e80| 69 72 65 63 74 6f 72 79 | 20 22 29 20 22 20 74 20 |irectory| ") " t |
|00000e90| 22 44 69 66 66 20 6e 65 | 77 20 66 69 6c 65 3a 20 |"Diff ne|w file: |
|00000ea0| 22 20 66 69 6c 65 2d 6e | 65 77 65 73 74 2d 62 61 |" file-n|ewest-ba|
|00000eb0| 63 6b 75 70 20 22 44 69 | 66 66 20 6f 72 69 67 69 |ckup "Di|ff origi|
|00000ec0| 6e 61 6c 20 66 69 6c 65 | 3a 20 28 22 20 66 69 6c |nal file|: (" fil|
|00000ed0| 65 2d 6e 61 6d 65 2d 64 | 69 72 65 63 74 6f 72 79 |e-name-d|irectory|
|00000ee0| 20 22 44 69 66 66 20 6f | 72 69 67 69 6e 61 6c 20 | "Diff o|riginal |
|00000ef0| 66 69 6c 65 3a 20 22 20 | 63 75 72 72 65 6e 74 2d |file: " |current-|
|00000f00| 70 72 65 66 69 78 2d 61 | 72 67 20 72 65 61 64 2d |prefix-a|rg read-|
|00000f10| 73 74 72 69 6e 67 20 22 | 44 69 66 66 20 73 77 69 |string "|Diff swi|
|00000f20| 74 63 68 65 73 3a 20 22 | 20 64 69 66 66 2d 73 77 |tches: "| diff-sw|
|00000f30| 69 74 63 68 65 73 20 6d | 61 70 63 6f 6e 63 61 74 |itches m|apconcat|
|00000f40| 20 69 64 65 6e 74 69 74 | 79 20 22 20 22 5d 20 38 | identit|y " "] 8|
|00000f50| 29 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 64 |)]).(def|alias 'd|
|00000f60| 69 66 66 2d 62 61 63 6b | 75 70 20 23 5b 28 66 69 |iff-back|up #[(fi|
|00000f70| 6c 65 20 26 6f 70 74 69 | 6f 6e 61 6c 20 73 77 69 |le &opti|onal swi|
|00000f80| 74 63 68 65 73 29 20 22 | c0 89 19 1a c3 5c 66 21 |tches) "|.....\f!|
|00000f90| 83 13 00 5c 66 12 c5 5c | 66 21 11 82 20 00 c6 5c |...\f..\|f!.. ..\|
|00000fa0| 66 21 86 1d 00 c7 c8 5c | 66 5c 22 12 5c 66 11 c9 |f!.....\|f\".\f..|
|00000fb0| 5c 6e 09 0e 5c 6e 23 2a | 87 22 20 5b 6e 69 6c 20 |\n..\n#*|." [nil |
|00000fc0| 6f 72 69 20 62 61 6b 20 | 62 61 63 6b 75 70 2d 66 |ori bak |backup-f|
|00000fd0| 69 6c 65 2d 6e 61 6d 65 | 2d 70 20 66 69 6c 65 20 |ile-name|-p file |
|00000fe0| 66 69 6c 65 2d 6e 61 6d | 65 2d 73 61 6e 73 2d 76 |file-nam|e-sans-v|
|00000ff0| 65 72 73 69 6f 6e 73 20 | 64 69 66 66 2d 6c 61 74 |ersions |diff-lat|
|00001000| 65 73 74 2d 62 61 63 6b | 75 70 2d 66 69 6c 65 20 |est-back|up-file |
|00001010| 65 72 72 6f 72 20 22 4e | 6f 20 62 61 63 6b 75 70 |error "N|o backup|
|00001020| 20 66 6f 75 6e 64 20 66 | 6f 72 20 25 73 22 20 64 | found f|or %s" d|
|00001030| 69 66 66 20 73 77 69 74 | 63 68 65 73 5d 20 34 20 |iff swit|ches] 4 |
|00001040| 22 5c 0a 44 69 66 66 20 | 74 68 69 73 20 66 69 6c |"\.Diff |this fil|
|00001050| 65 20 77 69 74 68 20 69 | 74 73 20 62 61 63 6b 75 |e with i|ts backu|
|00001060| 70 20 66 69 6c 65 20 6f | 72 20 76 69 63 65 20 76 |p file o|r vice v|
|00001070| 65 72 73 61 2e 0a 55 73 | 65 73 20 74 68 65 20 6c |ersa..Us|es the l|
|00001080| 61 74 65 73 74 20 62 61 | 63 6b 75 70 2c 20 69 66 |atest ba|ckup, if|
|00001090| 20 74 68 65 72 65 20 61 | 72 65 20 73 65 76 65 72 | there a|re sever|
|000010a0| 61 6c 20 6e 75 6d 65 72 | 69 63 61 6c 20 62 61 63 |al numer|ical bac|
|000010b0| 6b 75 70 73 2e 0a 49 66 | 20 74 68 69 73 20 66 69 |kups..If| this fi|
|000010c0| 6c 65 20 69 73 20 61 20 | 62 61 63 6b 75 70 2c 20 |le is a |backup, |
|000010d0| 64 69 66 66 20 69 74 20 | 77 69 74 68 20 69 74 73 |diff it |with its|
|000010e0| 20 6f 72 69 67 69 6e 61 | 6c 2e 0a 54 68 65 20 62 | origina|l..The b|
|000010f0| 61 63 6b 75 70 20 66 69 | 6c 65 20 69 73 20 74 68 |ackup fi|le is th|
|00001100| 65 20 66 69 72 73 74 20 | 66 69 6c 65 20 67 69 76 |e first |file giv|
|00001110| 65 6e 20 74 6f 20 60 64 | 69 66 66 27 2e 22 20 28 |en to `d|iff'." (|
|00001120| 6c 69 73 74 20 28 72 65 | 61 64 2d 66 69 6c 65 2d |list (re|ad-file-|
|00001130| 6e 61 6d 65 20 22 44 69 | 66 66 20 28 66 69 6c 65 |name "Di|ff (file|
|00001140| 20 77 69 74 68 20 62 61 | 63 6b 75 70 29 3a 20 22 | with ba|ckup): "|
|00001150| 29 20 28 69 66 20 63 75 | 72 72 65 6e 74 2d 70 72 |) (if cu|rrent-pr|
|00001160| 65 66 69 78 2d 61 72 67 | 20 28 72 65 61 64 2d 73 |efix-arg| (read-s|
|00001170| 74 72 69 6e 67 20 22 44 | 69 66 66 20 73 77 69 74 |tring "D|iff swit|
|00001180| 63 68 65 73 3a 20 22 20 | 28 69 66 20 28 73 74 72 |ches: " |(if (str|
|00001190| 69 6e 67 70 20 64 69 66 | 66 2d 73 77 69 74 63 68 |ingp dif|f-switch|
|000011a0| 65 73 29 20 64 69 66 66 | 2d 73 77 69 74 63 68 65 |es) diff|-switche|
|000011b0| 73 20 28 6d 61 70 63 6f | 6e 63 61 74 20 28 71 75 |s (mapco|ncat (qu|
|000011c0| 6f 74 65 20 69 64 65 6e | 74 69 74 79 29 20 64 69 |ote iden|tity) di|
|000011d0| 66 66 2d 73 77 69 74 63 | 68 65 73 20 22 20 22 29 |ff-switc|hes " ")|
|000011e0| 29 29 20 6e 69 6c 29 29 | 5d 29 0a 28 64 65 66 61 |)) nil))|]).(defa|
|000011f0| 6c 69 61 73 20 27 64 69 | 66 66 2d 6c 61 74 65 73 |lias 'di|ff-lates|
|00001200| 74 2d 62 61 63 6b 75 70 | 2d 66 69 6c 65 20 23 5b |t-backup|-file #[|
|00001210| 28 66 6e 29 20 22 c0 09 | c2 5c 22 89 1b 83 10 00 |(fn) "..|.\".....|
|00001220| 0b c2 09 5c 22 82 46 00 | c4 c5 09 21 21 11 c6 09 |...\".F.|...!!...|
|00001230| 21 1e 07 c8 0e 07 21 85 | 24 00 0e 07 29 86 46 00 |!.....!.|$...).F.|
|00001240| c9 09 21 1e 5c 6e cb 09 | 21 cc 50 89 1e 0d 47 1e |..!.\n..|!.P...G.|
|00001250| 0e 0e 5c 6e cf d0 0e 0d | 0e 5c 6e 5c 22 d1 5c 22 |..\n....|.\n\".\"|
|00001260| 40 50 2b 29 87 22 20 5b | 66 69 6e 64 2d 66 69 6c |@P+)." [|find-fil|
|00001270| 65 2d 6e 61 6d 65 2d 68 | 61 6e 64 6c 65 72 20 66 |e-name-h|andler f|
|00001280| 6e 20 64 69 66 66 2d 6c | 61 74 65 73 74 2d 62 61 |n diff-l|atest-ba|
|00001290| 63 6b 75 70 2d 66 69 6c | 65 20 68 61 6e 64 6c 65 |ckup-fil|e handle|
|000012a0| 72 20 66 69 6c 65 2d 63 | 68 61 73 65 2d 6c 69 6e |r file-c|hase-lin|
|000012b0| 6b 73 20 65 78 70 61 6e | 64 2d 66 69 6c 65 2d 6e |ks expan|d-file-n|
|000012c0| 61 6d 65 20 6d 61 6b 65 | 2d 62 61 63 6b 75 70 2d |ame make|-backup-|
|000012d0| 66 69 6c 65 2d 6e 61 6d | 65 20 62 61 6b 20 66 69 |file-nam|e bak fi|
|000012e0| 6c 65 2d 65 78 69 73 74 | 73 2d 70 20 66 69 6c 65 |le-exist|s-p file|
|000012f0| 2d 6e 61 6d 65 2d 64 69 | 72 65 63 74 6f 72 79 20 |-name-di|rectory |
|00001300| 64 69 72 20 66 69 6c 65 | 2d 6e 61 6d 65 2d 6e 6f |dir file|-name-no|
|00001310| 6e 64 69 72 65 63 74 6f | 72 79 20 22 2e 7e 22 20 |ndirecto|ry ".~" |
|00001320| 62 61 73 65 2d 76 65 72 | 73 69 6f 6e 73 20 62 76 |base-ver|sions bv|
|00001330| 2d 6c 65 6e 67 74 68 20 | 73 6f 72 74 20 66 69 6c |-length |sort fil|
|00001340| 65 2d 6e 61 6d 65 2d 61 | 6c 6c 2d 63 6f 6d 70 6c |e-name-a|ll-compl|
|00001350| 65 74 69 6f 6e 73 20 23 | 5b 28 66 6e 31 20 66 6e |etions #|[(fn1 fn|
|00001360| 32 29 20 22 c0 09 21 c0 | 5c 6e 21 56 87 22 20 5b |2) "..!.|\n!V." [|
|00001370| 62 61 63 6b 75 70 2d 65 | 78 74 72 61 63 74 2d 76 |backup-e|xtract-v|
|00001380| 65 72 73 69 6f 6e 20 66 | 6e 31 20 66 6e 32 5d 20 |ersion f|n1 fn2] |
|00001390| 33 5d 5d 20 36 20 22 5c | 0a 52 65 74 75 72 6e 20 |3]] 6 "\|.Return |
|000013a0| 74 68 65 20 6c 61 74 65 | 73 74 20 65 78 69 73 74 |the late|st exist|
|000013b0| 69 6e 67 20 62 61 63 6b | 75 70 20 6f 66 20 46 49 |ing back|up of FI|
|000013c0| 4c 45 2c 20 6f 72 20 6e | 69 6c 2e 22 5d 29 0a 28 |LE, or n|il."]).(|
|000013d0| 70 72 6f 76 69 64 65 20 | 28 71 75 6f 74 65 20 64 |provide |(quote d|
|000013e0| 69 66 66 29 29 0a       |                         |iff)).  |        |
+--------+-------------------------+-------------------------+--------+--------+